Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🐛 fix incognito scans #3518

Merged
merged 3 commits into from
Mar 7, 2024
Merged

🐛 fix incognito scans #3518

merged 3 commits into from
Mar 7, 2024

Conversation

imilchev
Copy link
Member

@imilchev imilchev commented Mar 7, 2024

  • pass through upstream creds if available
  • do not fetch the bundle for every asset
  • use upstream bundle when upstream config is available (even if in incognito)

fixes #3502

imilchev added 2 commits March 7, 2024 13:58
Signed-off-by: Ivan Milchev <[email protected]>
Signed-off-by: Ivan Milchev <[email protected]>
Copy link
Contributor

github-actions bot commented Mar 7, 2024

Test Results

2 849 tests  ±0   2 848 ✅ ±0   1m 11s ⏱️ -2s
  186 suites ±0       1 💤 ±0 
    5 files   ±0       0 ❌ ±0 

Results for commit 938ed2b. ± Comparison against base commit f82f59d.

This pull request removes 3 and adds 3 tests. Note that renamed tests count towards both.
go.mondoo.com/cnquery/v10/llx ‑ TestSuccess/2024-03-06_17:26:02.087106378_+0000_UTC_m=+0.016518067
go.mondoo.com/cnquery/v10/llx ‑ TestTruthy/2024-03-06_17:26:02.087106378_+0000_UTC_m=+0.016518067
go.mondoo.com/cnquery/v10/llx ‑ TestTruthy/2024-03-06_17:26:02.087106378_+0000_UTC_m=+0.016518067#01
go.mondoo.com/cnquery/v10/llx ‑ TestSuccess/2024-03-07_09:53:10.545071827_+0000_UTC_m=+0.017942682
go.mondoo.com/cnquery/v10/llx ‑ TestTruthy/2024-03-07_09:53:10.545071827_+0000_UTC_m=+0.017942682
go.mondoo.com/cnquery/v10/llx ‑ TestTruthy/2024-03-07_09:53:10.545071827_+0000_UTC_m=+0.017942682#01

♻️ This comment has been updated with latest results.

apps/cnquery/cmd/scan.go Outdated Show resolved Hide resolved
if err != nil {
return nil, err
// If we run in debug mode, download the asset bundle and dump it to disk
if val, ok := os.LookupEnv("DEBUG"); ok && (val == "1" || val == "true") {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we not use the same logic as in here

cnquery/logger/debug.go

Lines 44 to 46 in 1b98d7f

if !log.Debug().Enabled() {
return
}
?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we only dump this if the env var DEBUG=1 is set. I think log.Debug().Enabled() is also true when we just have --log-level debug. I don't think we want to have these files in that case.

That same condition exists in cnspec for dumping the bundle there too. I just used the same approach

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

temporarily ok, but we need to extract this into a function. Otherwise it will be hard to change that in the future https://github.com/mondoohq/cnquery/blob/main/logger/debug.go#L77

Signed-off-by: Ivan Milchev <[email protected]>
@imilchev imilchev merged commit 50e4098 into main Mar 7, 2024
14 checks passed
@imilchev imilchev deleted the ivan/incognito-scans branch March 7, 2024 16:36
@github-actions github-actions bot locked and limited conversation to collaborators Mar 7, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Suddenly the --incognito flag seems not to work anymore with cnquery scan
2 participants